Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BP: release/v6 <- #71] [pfm][fix] patch arbitrary account passthrough #80

Merged
merged 3 commits into from
Aug 3, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Aug 2, 2023

This is an automatic backport of pull request #71 done by Mergify.
Cherry-pick of d72e83c has failed:

On branch mergify/bp/release/v6/pr-71
Your branch is up to date with 'origin/release/v6'.

You are currently cherry-picking commit d72e83c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   middleware/packet-forward-middleware/README.md
	modified:   middleware/packet-forward-middleware/router/ibc_middleware.go
	modified:   middleware/packet-forward-middleware/router/types/forward.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   .gitignore
	both modified:   middleware/packet-forward-middleware/router/module_test.go
	deleted by us:   modules/ibc-hooks/client/cli/query.go
	deleted by us:   modules/ibc-hooks/hooks.go
	deleted by us:   modules/ibc-hooks/ibc_module.go
	deleted by us:   modules/ibc-hooks/ics4_middleware.go
	deleted by us:   modules/ibc-hooks/keeper/keeper.go
	deleted by us:   modules/ibc-hooks/sdkmodule.go
	deleted by us:   modules/ibc-hooks/simapp/ante.go
	deleted by us:   modules/ibc-hooks/simapp/app.go
	deleted by us:   modules/ibc-hooks/simapp/export.go
	deleted by us:   modules/ibc-hooks/simapp/simulation_test.go
	deleted by us:   modules/ibc-hooks/simapp/test_helpers.go
	deleted by us:   modules/ibc-hooks/tests/unit/mocks/isc4_middleware_mock.go
	deleted by us:   modules/ibc-hooks/tests/unit/module_test.go
	deleted by us:   modules/ibc-hooks/wasm_hook.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* don't allow funds to pass through arbitrary accounts, use hash of pfm+sender+channel

* lint

* use types.ModuleName

* update tests

* better errors

override packet

fix incorrect bech32

update error desc

refactor receiveFunds

* update README

* tidy errors

* lint

* chore: remove go.work

* chore: lint

---------

Co-authored-by: jtieri <justin@thetieris.com>
(cherry picked from commit d72e83c)

# Conflicts:
#	.gitignore
#	middleware/packet-forward-middleware/router/module_test.go
#	modules/ibc-hooks/client/cli/query.go
#	modules/ibc-hooks/hooks.go
#	modules/ibc-hooks/ibc_module.go
#	modules/ibc-hooks/ics4_middleware.go
#	modules/ibc-hooks/keeper/keeper.go
#	modules/ibc-hooks/sdkmodule.go
#	modules/ibc-hooks/simapp/ante.go
#	modules/ibc-hooks/simapp/app.go
#	modules/ibc-hooks/simapp/export.go
#	modules/ibc-hooks/simapp/simulation_test.go
#	modules/ibc-hooks/simapp/test_helpers.go
#	modules/ibc-hooks/tests/unit/mocks/isc4_middleware_mock.go
#	modules/ibc-hooks/tests/unit/module_test.go
#	modules/ibc-hooks/wasm_hook.go
@jtieri jtieri merged commit cf52464 into release/v6 Aug 3, 2023
4 checks passed
@jtieri jtieri deleted the mergify/bp/release/v6/pr-71 branch August 3, 2023 19:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants